Tweaks and manifest