some minor aestetic changes, others in preparation for upgrading to SC 1.10 [skip ci]