Level 1.1 Polish

Fixed majority of problems with refactor as pertaining to Level 1.1