Add name tag printing and other fixes