more integration progress, minor fixes