change subst formatting, add solve-cstr to figure 5