Few changes

Small changes based on python code. Function replyReceived need
modification. Don't know how/where to execute resource_id add and
removal to resource_want_to add set, while request is being executed.