NEW: jsdoc support, FIX stuff