User mapping, event hooks, and bug fixes oh my