Odds and ends

Some uncommited stuff that's been sitting around