Assassination (continued) & minor bug fixes