Clean up, added TODOs, added missing flat embedded retrieval