some more work on unit.cs