Fixed up some code, added overlay graphic and draw.