Added toggle controls, clear data controls, and further testing.