new dependencies
added comments, renamed fncs