* Fixed a few bugs