slider and some bug fixes
merge