Overhaul after torture chamber. Mild todos left.