Spin and Charge Structure Factor of the 2-d Hubard Model