Some fixes and added xref.