View minor modifications, thread changes to allow client to close