Fixed /several/ issues with this branch.