some small fixes + add -h and --help

Signed-off-by: Mattias Andrée <maandree@operamail.com>