Some stylistic fixes and prep for event wiring...just wondering why current events don't work...