some slight bugfixes, removed redundant classes
changes