Tons of little fixes