misc label changes from djalma