lotts of minor changes