Major refactoring done, bugs fixed