moved around stuff, removed events, added events, better handling