const and asm tweaks