optimisations to networking and further UI