Ab doomsday

Last minute fixes