Fixed all methods and organized

Updated all methods to use internal values from Choices 2.0.2; organized into logical sections