Faster world queries, removed some digressing comments