I do pushups with wide grip, diamond grip, incline (feet up) and lifting one leg at time off the ground. I also do plyometric pushups where you try to explode your entire body off the ground. There is one "rocking" pushup that you extend though yoga like positions while doing, that seems to have helped my shoulders. I'm doing them as part of the p90x workout, but they add variety to my normal routines.