updated asm, more good things