fixing some dependency issues and iterating