house hour redo + some little optimizations and tweaks