finally committing some recent changes