ome minor fixes
minor bug fixes