* Fixed various bugs