minor changes. figure out errors issue