Added all the necessary fields, plus some minor cleanup. Updated README.