Removed unnessicary indirection from Entity iterator list
Fixed order of initalisation