tons of little fixes