tuning signup form + other cleanup.