Add todos about test and documentation; add TODOs in Interaction and refactor a tiny bit.
Merge