cleanups and fixmes