A few changes

Just some fiddly stuff to make it easier to get running elsewhere.