fixed up some stuff and did the bonus, formatting is a pain :)