done with user profile and small cleanup