added map and more options