Ability to reload a single shot, moved some files