Fixed many more things.