more product markup and some fixes