WIP Allegro5 improvements