Probably the final pull request for this update...

Changes are outlined in the commit descriptions.Fairly stable, a quick look through to see if all Redux code is in tact would be appreciated.