minor updates (a lot)