fix comments, pass tests