Cleaned up code, organized everything

also fixed bug where only one info box would come up on the map

DONE