unify and enhance plot functions