added annotations for possible errors in code and documentation
Merge branch 'devArmin'
removed unnecessary todo