improved velocity estimation, added some sources