Some minor updates
  Fixed slider to work correctly with steps, and just better overall
Merge remote-tracking branch 'origin/master'