Tidy and fix bugs.