Moretweaks

A few more tweaks.