fixes, metrics and stuff