Fix forgotten shot variables, cleanups.