cleanup and improvements
protokoll alle 2.x fertig