fixed lotsa minor errors