fixed lots of stuff - yahoo