Cleanup and direction fix
moar cleanup of event handling
updated