Fixed minor types and confusing comments