Reworkings on event firing (or actually NOT firing) issues...