Added and removed code from base_unit template (from tactics)
touch up