#30 bugfix tmpcommit
#35 & #36 & #37 & #38 & #39 & #41 completed +bugfixes