JSON-state + browser-request fixes + minor other improvements