I have (hopefully) fixed these issues.
I also added a map with Xs to mark the spots where the parts are.
Thank you for your help :)