Fixed broken dependencies, and did general boilerplate cleanup