more work on ammotype