more bug fixes
minor edit