@comment out from disasm, renaming to .hh instead of .h, minor changes