velocity guidance updates and bugfixes