Small bug fixes
Small bug fixes, updated documents