Various small improvements.

LAST VERSION to support XML-RPC