Fixes some bugs and gets graphing looking nice.