cleaned up make files and fixed and some WIP