Small changes. And moved drawmarkers to own java file