close #1 plus hints improvements