big clean up part 1; stable version 27.08.2014