Updated examples to match the parser (now that it catches errors!) Also, updated parser to have better logging in controller branches.