Add flow diagram and address most FIXMEs