Minor changes

Mostly prepping (in small ways) for major new features