Went through plans with Gaya, nicifying code, improving failure handling greatly

The object manipulation plans are much shorter and more elaborate in failure handling.