Cleaned up code, added tooltips on map