Contact updates + other tweaks