tweaks with some deps