Got it to work, ended up just changing the security to WPA from WP2 then doing a full reset on the router, and now the WiFi works like a charm ( although kind of slow I do have to admit, especially since I have a 20mb down & 8 up connection )