cleaning up make process.  needs lots more work...