Updates to Qi forms et. al.