Adding logging to watchtower, improved some logic