Improvements to Wikipedia parser