close #110 and small fixes