Jarod's changes 6
cleanup slider code
Merge remote-tracking branch 'origin/master'