Tweaks and Fixes #2