Add link to further documentation and todos
Clean up code
Merge branch 'develop'