fixed a few issues with assembler.