fixed all the bugs from what we turned in for the info 343 final... I think. Any subsequent commits will mean I lied.