Added convenience scale parameters for velocity and did some bug fixing which occured during velocity calculation.