Back from the dead: Add orphaned changes (See notes)

It's been over a year since I worked on this repo. This commit mostly
consolidates changes that weren't staged.
Update node modules