Clean up, more to painter, new allegro events and more