FIXME cleanup; misc small changes