bug fixes
minor changes