2010-12-08/09
2010-12-13
more fixes
More cleaning.