I am really liking this, but why not remove the rivits from the plates and add the details another time when texturing, using bump or displacements to save you a bit of time. i modelled the details because I wanted them I thought I might not be the one to texture it ,as I said earlier I would have used displacements if I was texuring but no matter the rivets and pretty much done now so I will leave them. I have enough time to finish because there is not much left to add and just tidying up to do really.