Moving Eriu-specific code out
Fixed world map save/load bs