finished product markup and some fixes