Cleaned up the analysis a bit. Note I haven't added the new plots yet.