Changed several files and integrated signup