updated deprecated code + added wikiscraping functionality