Fixing some session related things, updated conf sample to new format