FILE: outcommenting code that needs reviewed/redone.

Signed-off-by: bert <bert.timmerman@xs4all.nl>
BLOCK: added more tests corrections.

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