Fix comments and dependencies