Minor changes

Removed use of entityid
Forced world save
Added some navigation variables