replace all instance of - for metrics calls

also better logging when things go wrong