fixed a lot of the Try expected type errors.
fix the macro expansion bug