small fixes
more comments