some almost final minor changes