fixes + online and offline Event handlers