Bug Fixes and Tweaks

issues found from testing