Improved expression formatting on error printing
Added some missing types