#33 aspect ratio addition and lots of bugfixes