Add combination pricing, fix paperclip file validation