Some Unit fixes

reference to board added to units