formatting cleanups, more complete base functionality