Use mw.Title over home-made solution
Bug fixes
Cleanup