Cleaned up a bit more, fixed a few typos