more metrics and cleanups
cleanups