many Swift updates/fixes