All label refernces and forgotten fixes and updates.