Back to more flo in lib, reverted mako's newer propritary files so we can upgrade with flo's newer ones