Various tweaks/fixes after usage in the wild
Merge pull request #81 from goinstant/jbowes/live-usage-tweaks

Various tweaks/fixes after usage in the wild