cleaned up a bit
turned in the hw, still need to fix a few bugs though