fixes to pot; moving more data out of muls into pot and wave