minor fixes

added small fixes
removed leftovers