Updates to JS parsing and un-prettyable return