Various minor tweaks

Preparation for submission o 10/20