Minor edits, a few new things, tweak assignments