bug fixes and made more responsive