fixes, better defines, flow include