product index, and few other fixes