Minor Bugfixes (wrong names)
Updated asm to new spec