copy and route fixes
fixed spec per changes