fixes to make it fly