Major updates, basic session handling