some cleanups
changes in status