Take some photos and post them up in here.
I just finished a M31 Classic and there very easy to work on.
Can you list what you replaced and what issues you still have with it.
If its a Automatic AKA Press the button for the extraction to begin, You can program it by pressing the FLOW button down for 5 secs. I think it was. The water will run for that time then once it stops you put your cup under and press the correct cup button and once the cup is where you want it you press the same button again and it remembers the amount. To exit and save you will need to hold down the flow button again for 5 secs.
I may be wrong but give it a try :)