cleaned up code a bit
added ability to display popups
replaced markers with vector features