fixed velocity / ms bugs