Smallfixes

small fixes after thomas's comments