Revert "fix a few goofed comments"

This reverts commit 487896167e8f7134e75562b0acf3e3c795c2f163.
Revert "no need to split update loop?"

This reverts commit 06149eb4e50269e1b4226994ee6045dbd5335500.
Revert "fix some naming + dupe update loop"

This reverts commit 9d370a1fdf1f74d9b004863b52a3126ed189b88a.
Revert "first attempt at #159"

This reverts commit a4750e01a90adaf9200e21420438f92e8d247ce6.