a few cleanups and stable