more commands, pop-up notifications, proper editing/cancel behavior