A lot of fixes to speakers, also home and about
Merge pull request #3 from nphillips/master

A lot of fixes to speakers, also home and about