Simplified fix add a bunch, added some macros, added fix_neg