secondcommit

some fixes etc.