fix overlay not covering everything
fix shuffle error