contacts working well!

other various fixes/upgrades.