some fix, add plots