Fix some comments and some dependency paths