Added some new plotting features!