Minor tweaks and additions.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>