More Bug Fixes

Fixes calls in World (still confusing but…correct now).