Fix embarassing math error, let us not speak of it ever
Clean up the plotting code, we don't really need it
Delete some one-line functions