Fix close helpmessage and rename a few things