todos + some cleanups