Fixed some bugs. Now we are well merged. Ready for demos.