minor changes/bug fixes
minor changes/bug fixes