Fixed a few bugs!