Added polygon drawing and marker plotting.