Added Velocity only mode

also some small fixes