more fixes
minor fixes