fixed draw, added sub