Fixed bug in last commit + fixed queuing up multiple actions with shift key