rework makefiles and flow attributes