Fixed unit behavior + small changes