some additions/cleanups