cleaned up and working on events