Minor updates + new file versions for convenience