fixing username problem in more files so it looks for a username rather than using a static one.