slightly better dependency handling.

Still a long way to go.