Adding settings and some UX niceties.