So late, delirious. Committing a bunch of small changes