Added ClampSaver, fixed some bugs