Minor changes to speeds
Minor updates to layer