Updating documentation and some fixes/enhancements