* Partly fixed renamed functions
* Added some breadcrumbs