Include Macieks Code and clean up placemarkers