Improve make, add vacuum defs option

Keep things flexible, keep things small