Simon 2014 correctins made, still need to check two minor red bits