More equation handling changes made.