tweaks and fixes
latest commit.