Quick tip: WiFi eats a lot of battery, even when it's not connected to a specific network. Also, some applications change the settings for you WiFi connections, from "on demand" (in my case) to "automatically" so you may want to check that too.