Robuta

Hello, As the 2.0 release approaches, we have been spending time polishing and resolving things which we found during our playtesting.