Tweaks and Fixes #4