more cleanup and event nice stuff