5-30-2013a

Work on the parsing of the html elements, various changes