#9 little fixes