Improvements, more jsdoc removed
small fix