little fixes everywhere