small fixes
more small changes