fixes for HT and ST, adding combined plotting