fixed some errors from previuos commit