more cleanup and work on user profile, desktop...