Background fix (probably still bugs, but we'll find them as we go)