Fixed bugs, changed some velocity  changes