Various syntax tweaks and event binding changes