sane changes, build manifest and host/injection script changes