corrected typos & aligned with demonstrator bundles