minor fixes, docs, start of entropy method integration
merge