Updated dist.init with all the kewl stuff