finished the limits macros, much better