Cleanups and a few usabity functions.