Fikset todos and refs
Merge branch 'develop' of https://github.com/figa12/sw606f13 into develop