Minor refactoring, added TODOs and references to open issues.
Merge PR #1386 by @emanuele3d - todo notes for the future