loads of small changes to streamline setup
loads of small changes