Pedantic variable name change
Make SOA assignment more automatic; fix SOA deletion