Lots of changes. Added different marker types.