started on assembler
small bugfix, renamed stuff in assembler