Add EnderOres and fix some bugs