Power on/off problems

I've been having issues with power since my last update. I can work around it, but my powerdown options are:

1. Log out - does what it says - logs off
2. Restart - does what it says - Restarts
3. Shut Down - actually Logs out and sits there.
4. Hibernate - actually powers off. Oh it does the full hibernate thing, but it never recovers and restores the image. It just starts up.
5. Suspend - does what it says - Suspend.

pm-suspend suspends. pm-hibernate writes the image but restarts instead. I cleaned & remade the swap partition, but no joy. Do I need the full memory size for the swap image or only the used memory?