bug fixes, prepare to re architect registration iframe.