fixed some unit stuff