Some code edits with a backup push.
Changing a couple of things in the code.