Reorganised parameters file. Increased sophistication of makefile.