Properly scope session
Fix image sending (order of data)