update latest macros after fixing correction functions (also removing unnecessary things)