fixed a few major problems with velocity calculation etc.git status