add more dependencies
fix header mess