Fixes aspect ratio bug; Cleans up for 0.0.1