* Added some additional comments and cleaned a couple of things up