correct some mistakes and clarify future intent