Fixed helpmessage and added storage option