toggle changes for greater configurability, bug fix in events controller