various updates
Correct rendering of 1st stage of quote machine