More cleanup renames and comments

Added voice on/off checkbox