Added changes that I've been sitting on.