add missing deps
remove crufty comments