integrated things
bunch of fixes to make integration work, and some dirty logs