Research / Events and Bug Fixes

Added some more research, event hooks, and also performed some big
fixes.