Documented the Choice class methods and made some other minor variable changes.