Minor fixes and slide logic