Updates after review.
Updates after review.

crankyoldgit/artifacts,vonnopsled/artifacts,keithtyler/artifacts,sebastianwelsh/artifacts,vonnopsled/artifacts,sebastianwelsh/artifacts,destijl/artifacts,destijl/artifacts,pidydx/artifacts,keithtyler/artifacts,crankyoldgit/artifacts,pidydx/artifacts