Bug fixes and polish for final room