Completed world database & additions to simulator