Just committed all changes of the last month or so... should put things in real order soon.