added uniter and trooper annotations to units
moved unit properties to constatnts