Added voice and a few minor tweaks