yes the swap came with both of those parts. I'm waiting on a new wiring harness (the one that came with the swap, the plugs were broken and the harness was cut), a clutch (have stock clutch, but want a better one so I dont have to change out later), motor mounts (have stock motor mounts, but again, I want stronger) and a hotpipe/bov. Its only those four parts, but they're not the cheapest....