Adjust dimensions, fix minor bugs