cleanup unused variables, some small docs updates