Typo
Fix XS calls
zway initalization