small fixes and simplyfications