BugFix + Tweaks to Dev 1.0.9