Clean ups and improvements to facilitate some forthcoming stuff...