Changed the modifiers (again).
Minor tweaks.