pricing fixups and testes