Session loading now done by name rather than filename, and fixed some branching and loading issues.