Fixes for JSDoc & Clean-up