Fixed most of the bugs with the Robber