many more fixes