updates to ASM etc