a few new dependencies and slight cleanup