Fixes and tweaks. related to issue #208 #209