Fixed warnings
Added TODO's
Updated JSDoc