bug and copy/paste errors fixed
bug and copy/paste errors fixed