Added some things to map, fixed twitter and added weather