some more basic changes