World database fixes

My first time of the pull request. I hope that's right ;)