lot's of small fixes and tweaks.