cleanups and todos