Minor cleanups
Improve chain, add world start/stop