restore GGA+U and add do_bandstructure option