Tweaks

tweaked a couple of things that seemed to be causing a problem
Added support for initial velocities