Drawing initial overlays and fixing bugs