Comments, preview, bugfixes
fixes and improvements set
Merge branch 'devel'