added responsiveness, fixed finder