* Removed invalid names
* Bugfixes