* Fixed several bugs