got rid of error, still need to really clean up username