Small tweaks, adding dependencies