flaps and fixes