Bug Fix - apostrophes in name crashing
Minor Changes