moat comments, fix bug