finished repairing code after merge- yellow markers and pop up hover now...

... working