reactivate main switches + few fixes