more parsing changes, now using beautifulsoup and a dictionary