Some Bug Fixes and Documentation Updates