removed some options and added a class for handling the map