cleanup and updates, sessions