040d643 Tweaks and Fixes