update with some minor cleanups