Add identification labels, other fixes