Math fixes, duplist change, gen fixes