Made a few changes to map and twitter