some parser/html updates. fixing issue #1 and issue #3 (need to add tests for these though)