Methodology finished

and other small fixes