Bug Fixes and tweaks...