Improved kim suspend

@M66B patch - thanks