Getting the background right if a shot is cancelled and cleaning up some spaces.