code cleanup.
popup added.
marker options added.