merchandising and bug fixes