remove mistaken, cosmetic equation
resolve merge problem
improve 1959 diagnostics
minor changes to SATC schema