allow plot2 to handle lack of row annotations; reorganize parameters