two mistakes fixed