Added more responsiveness and trying to fix bugs