fixed some stuff, added metric