Some parsing fixes + state handling in youtube