Removed some old code, rewritten some comments, fixed typos

I just didn't like the old ones...