Fixed lazy fail and added all fish tokens to yacc