dependency handling tweaks

minor tweaks I found to be valuable when trying out the new code