fixes for some smaller issues