Misc changes, modified events to use text instead of string