small fixes... ready to close #138