add FIXME and other minor DRYing