Manifest update, minor tweaks