part 5 tweaks to fix session data issues