cleaned static lists to be maps and started fixing xml saver