Tidying up code- no real changes
Change marker appearance, remove data dump