1.6 anorithil revisions2

This is an updated version of orange's MR that he was going to go through and take what he wanted from (but isn't currently around to do so). This replaces !534 (closed) but that has the writeup of a lot of his changes.

Status changed to merged