bug fixes and contact conversion