- more logging
- improve dependency patterns