Added less dependency on hard-coded values for fake product generation. Made other changes as well based on feedback.