small fixes
working on comments