NYC releases revised streetcar plan