Gson comments
Minor updates