For the whining noise, get the car up to temp and pop the bonnet. Leave it running and put a long screwdriver to your ear and touch it to components. This should help you find out what the source of the whining is if it's not obvious or the sound is traveling.