Renamed the file that holds the s2cstmap, implemented more utility functions needed by the solver.