fixed bugs around apostrophes