Corrections and Improvements
Minor improvements in docs, tests