minor bug fixes
minor adjustment