refactor asm, parser progress