Assassination Update and other various fixes