Fix code after feedback, add ability to disable guest orders