Various Bug Fixes To The Phone And Address