ton of little fixes