API updates
small tweaks
typo
merge ASM