Fix npe, add settings to maps
release 2.1