moat output improvements