minor validation on apostrophe, a few minor tweaks