minor bug fixes
minor changes