updates and more comments
Merge branch 'draft' of github.com:s-ltf/IMS into draft