Lots of updates. Getting to be actually useful now.

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>