Fixed debug again, did some code tidying

2009-12-11, edouard