last little fixes