manifest gets facelift to support error on empty manifest file; small cleanups