fixed the regex's for the html parsing