Add dependencies, fix crazy-long lines