fixed the aspect ratio thing

also tons of refactoring left and right