Fix apostrophes and small issues