Various changes to make this run from a non-official place. This commit