Fixed many simple mistakes