added logging
Bunch of updates from production