small changes on unit class