refactored string parsing
add the rest of the custom geo options
added the rest of the bubble options