Cleaned up some parsing, basic plot functions in R