more tweaks to event handling and commands are much more straighforward