misc. bug fixes + Add Event auto-selector added