#54 little fixes