fixed up flows etc