#162 little fixes