Tweaked assembler to make it a bit more useful