Editor Bug Fix

Made some major bug fix changes for the Assembly Editor. The Editor is
not yet in the text, but is much closer to being production ready.