It was, but I changed a lot of different things at once, so I am not sure what has done it...
I stopped using Helix.
I stopped using a task killer.
I also set my screen to sleep at 30 seconds.
I told it to just use the wireless networks to get my location instead of GPS satellites.
The client has been updated in the last couple of days also.
The thing that really seemed to help was dumping Helix and not using the GPS satellites.