Trigger popupopen/close on markers too.
simplify popup methods, merge #738