Bug fixing, order problem corrections