Bug3010

Fix for redmine #3010, together with a bunch of inconsistencies that crossed my path (oh man I have to control this urge to fix all uglyness I see...)