Finally added the rest of Stephen's patches :)