Another thought on the pedal stroke is once you come through the bottom, think about driving your knee toward the handlebars (on the upstroke). It'll help you lift with your hip flexor and not mash down with your quad.