Resolved some small mistakes