Some more work on units