Some bug fixes, improved event system to handle many events from one choice