JsDoc and fixes