Small updates to code, and an attempt to fix my local git strangeness