safe macros
improved number loading performance