Feature/do not add owner if owned

Also a single comment grammar correction in there.