Lots of testing, improved graphing, improved fomula