little fixes

belongs to #104 and #85