Dependencies
Various fixes
Sumeet's configs.