fixed changes in columns; changed type uris; added annotations