better session/poor connection handling