Fixed livestreamer validation bugs. see #15

Also reverted some unnecessary changes of 23ec5886