more plots and minor fix