Continued refactoring, fixed bugs