Changing literal Oxygen to product key

Plus minor fixing minor issues noticed in passing.