Changed Handler to continue looping for the client
Small changes in indenting the comments