We give results for B, Bs, Bc and bottomonium spectroscopy using NRQCD heavy quarks and HISQ valence and sea quarks. Five MILC ensembles of gluon configurations with three values of the lattice spacing and m(light)/m(strange) values down to 0.1 are used that include 2+1+1 flavours of sea quark. Systematic errors in the NRQCD action are improved through the radiative correction of the coefficients of terms at v^4. Improved results for S-wave and P-wave bottomonium states are discussed as well as a prediction for the full D-wave spectrum. Preliminary results for the ground state B meson masses are also presented.