style fixes and dependency fixes