fixes, updates, fallback for session