Su2

Renamed a few things and fixed a bug that was making the optimization not actually work