fixing dependencies, adding comments