Several enhancements, small correction in README.