Latest corrections from Alex branch included