fix velocity storage and start/finish