Add dependencies. Minor cleanup