added shot spec, reorganized others