More testing, espec of interop. Fixed some issues.