G61 and Final Velocity fix

fixes #232