Apologies, but apparently some sliders on CracK's diff got deleted when slider lengths were recalculated, my mistake. Update to the diff he's posted above, then let me know and I'll rebubble.
EDIT: Done.
EDIT AGAIN: Popped again at CracK's request, see below
EDIT: Done.
EDIT AGAIN: Popped again at CracK's request, see below