2014-10-09_Minor-Tweaks