Fresh decompile with newer decompiler

Newer version of decompiler should fix some problems!