Committing before alpha-merge with Olof. Have fixed more variable values and smaller issues.

Signed-off-by: Farbror Tiny <jens.syntax@gmail.com>