Misc commenting and added mute/unmute - closes #13