I just need to varify your recommended parts to start with
Belt mt base pin, cyl. lock and trigger pin?

I noticed detent pin & spring in hammer assembly was missing the retention pin I should replace that correct?