Lots of small fixes and futher SwC advancement