various smaller changes