Fixed db name + imporved trackign script