Lots of bugs resolved