Update speed init
Minor changes