fixes to world and helpers

.h can't include function implementation... doh!