updated dependencies
updated comments & TODO