Extended transport to include more functions. Minor tidying too