minor changes / fixes
rewrite