Minor Bug fixes and documentation changes