combine manifest (cause no worky) and some fixes