edit
edited some mistakes