Improvements on unit entry.