more events, minor tweak in rendering side