Fixed up

Tidied up Gueant's method, began work on Lachapelle's method.