Cleaned up the package, and fixed some typos.

Please let me know if you find anything else.

More...