Resolved some other minor mistakes