Big Fixes

Fixed some more errors. Should just have plot and summary left to go.
Then I will clean up documentation and such.