World-related bugfixes

Fixes #35, #53, and kirderf1#7.