Some Bugfixes

Some bugfixes with classes and added the new wrapper-seperator in the
config-file.