Jhbate/quick fix

fixes for metrics and also better logging for updates