SwC most problems fixed