added ability to clamp and unclamp slider value to max and min
fixed merge conflicts