Bugfixes

Lots of them and some code tidying
Added rooms, some counts and bugfixes