Some small fixes and some new rooms