Client stop properly
clean up
Scripts added