updated base, cleanups