final edit pass (i hope)