Fixed a few bugs; added some more