more clean ups and doc fixes