new unit and couple fixes ofc