Added toggle switches, improvements to output.