Freak House: Bug fixes

Fix bugs, improve performance.