Minor clean-ups. Added new toggle option