cleanup keys, added TODO's