spiv: Cleanup and update help.

Signed-off-by: Cyril Hrubis <metan@ucw.cz>