Good rework done, still stuff to fix.  Type are good when respected