A bunch of cleanup/updates after initial use