WIP on completely untested manifest code
Minor cleanup