Fixed a few issues with the Assembler, almost there.