Updated comments within the code

darcs-hash:20100220080027-58252-fff0da02fa5a0b53f981a2e7805103fd9c196811
Improved settings names

darcs-hash:20100222125852-58252-448d781b0a4802e0a8a58ed24bbbac2ca2562361