A lot of fixes and refactoring from doing testing