Got sales data working as well, and several other changes