groomed some fixmes