Ben Thomas - 2007-12-05

1.0.7-i patch: correct parameter checking, add tracing