Better substitution heuristic
Fix bug with u-substitution, work around csc bug