Left some minor bugs; ask 'bout  them tutor