Finish disasm
Cleanups and bugfixes..