Cleanup and minor udpates to CQ Fiddle