Try to presoak all nuts/bolts that look a bit manky with wd40, will put up less of a fight then...

Sounds like its going good anyways!