some usability fixes + code fixes + more events