* Fixed some namings
* Fixed some minor issues