Corrected make, use more macros