Syntax Updates & Better HTML handling