merging kyle's documentation changes