switch to table rate, edit completion message
add shipping before express checkout redirect