Bunch of logging fixes, roll back to express temporarily