Fix random bugs and clean house