Corrected issues with values from event handlers

- Also, added better logic for home/away switch