Improve assembler, macros