nagi batch changes

mostly preview consistency and such