remove invalid typenames, small bugfixes

 Please enter the commit message for your changes. Lines starting