beremiz

Fixed debug again, did some code tidying

2009-12-11, edouard
688e84df3408
Fixed debug again, did some code tidying