Minor fixes

* Removed hardcoded type identifiers
* Fixed typos
* Improved string handling