Tweaks and Bug Fixes