more almost final stuff