cleaning, fixing, doc improvements