debug
added new user linking and fixed bugs