minor corrections and structure improvements
merge commit