Dell Vostro 200 Mini CPU/RAM Upgrade Question!

So I got an old Dell Vostro 200 Mini from a friend about a year ago. It has been sitting around for a while now and I decided that I'll upgrade it. After doing some research on the Dell Vostro 200, I found out that there are two versions of this PC. I have the Vostro 200 with the G33M02 motherboard and a stock Bestec 300w PSU. I have decided that I am going to replace the current stock CPU with an Intel Core 2 Duo E8400 3.0GHz. Here is the link to the CPU --> ( http://www.amazon.com/gp/product/B0019NKGR4/ref=pe_157280_112104580_em_1p_0_ti ). Will this CPU fit into the motherboard correctly without having to do extra work? If I replace the current stock CPU (Intel Pentium E2140 1.6GHz), will I need a new PSU too? Both CPU's have the same 65w TDP so I hope not but just to make sure, I am asking. I also have an Nvidia Geforce GT 630 also installed which has a TDP of 65w as well. I also need to upgrade the RAM in this computer and I am planning to buy the following PNY RAM stick. ---> ( http://www.amazon.com/PNY-Channel-PC2-5300-Desktop-MD2048KD2-667/dp/B000I2C80K ). Can someone tell me if this set of RAM sticks are compatible with my version of Dell's Vostro 200! Thank you!