fixed some inconsistencies, some references and such