Added more signal and now correctly closing clients