many minor updates