Added a few more features -- and a few more code comments.