works on contact details
resolves conflicts and fixes spec errors
merges master, resolves conflicts