Tweaks

Re-enabled smartypants and other tweaks