Initial commit of some cipher changes to fix topic bugs