manifest_version updated, minor tweaks