Small clean up
Extend api and add wikipedia api endpoint