fix some smaller issues