Most bugs fixed on assembler