bug fix & setting update

fix for repeat order
settings moved
…