Minor Fixes and Tweaking