Update Assembler.java

Updated version of me and angelique's part with bug fixes