lots of cleanup

Making documentation consistent with code