Bug fixing, refactoring, clean up.