Edited sections 5.5, 6, and made distribution definitions consistent