some smaller changes