some small fix, close #81