convergence tweaks and updated macros