marker code expanded and geo.js tidying