Had a review at the gym last night, with a new guy, Jason. He was really helpful - I've upped my weights a little, and dumped almost all of the machines for free weights. The only machines I'm still using are a couple of pulleys, for my back and triceps, and the lat pulldown. The rest of the time (1.5h) except for 20 minutes of cardio is all free weights. I'm also doing some proper squats now, just to keep my legs in - my major focus is on torso and upper body.