Small tweaks, added helper for contact info