Map markers almost done! Also, optimized stuff.

Got rid of as much stuff as possible.