cleanup and little fixes

all there is seems to work good enough to commit, still a lot to be done