Corrections to world restrictions. Closes #17